Rotate J13 180 degrees, so right angle latching connector can be used.

/////////////////////////////////////////////////////////////////////////////////

Solution:
No change.  Existing design works.

Done